Skip to content

BUG: arithmetic with reindex pow #32734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Mar 17, 2020
Merged

BUG: arithmetic with reindex pow #32734

merged 5 commits into from
Mar 17, 2020

Conversation

jbrockmendel
Copy link
Member

@jbrockmendel jbrockmendel commented Mar 15, 2020 •
edited
Loading

@jbrockmendel jbrockmendel added this to the 1.0.3 milestone Mar 15, 2020
TomAugspurger
TomAugspurger reviewed Mar 16, 2020
View reviewed changes
Copy link
Contributor

@TomAugspurger TomAugspurger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix looks good. A couple comments on the test.

I have a PR open adding a 1.0.3.rst

@jreback jreback added the Numeric Operations Arithmetic, Comparison, and Logical operations label Mar 17, 2020
@jreback
Copy link
Contributor

jreback commented Mar 17, 2020

lgtm. needs a rebase

@TomAugspurger TomAugspurger merged commit be7bfe6 into pandas-dev:master Mar 17, 2020
@TomAugspurger
Copy link
Contributor

@meeseeksdev backport to 1.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Mar 17, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 be7bfe6ab7ae2cba056f61dea6c3b0226bf80082
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #32734: BUG: arithmetic with reindex pow'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-32734-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #32734 on branch 1.0.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@TomAugspurger
Copy link
Contributor

@jbrockmendel do you have time to backport this today?

@jbrockmendel
Copy link
Member Author

do you have time to backport this today?

yes

jbrockmendel added a commit to jbrockmendel/pandas that referenced this pull request Mar 17, 2020
@jbrockmendel
BUG: arithmetic with reindex pow (pandas-dev#32734)
5956ba3
@jbrockmendel jbrockmendel deleted the arith_Fix branch March 17, 2020 16:08
TomAugspurger pushed a commit that referenced this pull request Mar 17, 2020
@jbrockmendel
BUG: arithmetic with reindex pow (#32734) (#32777)
cfccb68
SeeminSyed pushed a commit to CSCD01-team01/pandas that referenced this pull request Mar 22, 2020
@jbrockmendel @SeeminSyed
BUG: arithmetic with reindex pow (pandas-dev#32734)
53162c5
jbrockmendel added a commit to jbrockmendel/pandas that referenced this pull request Mar 23, 2020
@jbrockmendel
BUG: arithmetic with reindex pow (pandas-dev#32734)
59b5e96
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomAugspurger TomAugspurger TomAugspurger approved these changes

Assignees
No one assigned
Labels
Numeric Operations Arithmetic, Comparison, and Logical operations
Projects
None yet
Milestone
1.0.3
Development

Successfully merging this pull request may close these issues.

Regression in artihmetic ops with alignment and special cases
3 participants
@jbrockmendel @jreback @TomAugspurger